From 69e9ec988e94d3421739c90576ae1c5a6b0c0ea9 Mon Sep 17 00:00:00 2001 From: Michael Schumacher Date: Sat, 17 Dec 2005 21:34:39 +0000 Subject: [PATCH] add libgw32 and its dependencies to LDADD for the win32 platform 2005-12-17 Michael Schumacher * extensions/Makefile.in: add libgw32 and its dependencies to LDADD for the win32 platform --- ChangeLog | 5 +++++ extensions/Makefile.in | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8487ba..e26caf1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-17 Michael Schumacher + + * extensions/Makefile.in: add libgw32 and its dependencies to + LDADD for the win32 platform + 2005-11-10 Øyvind Kolås * docs/index-static.html.in: Minor reformulations and spelling fixes. diff --git a/extensions/Makefile.in b/extensions/Makefile.in index 927c904..1f909c8 100644 --- a/extensions/Makefile.in +++ b/extensions/Makefile.in @@ -1,6 +1,9 @@ # General minimalistic compile file for self contained single # file babl_extensions +@OS_WIN32_TRUE@win32_libs = -lgw32c -liberty -lole32 -luuid -lwsock32 +@OS_WIN32_TRUE@no_undefined = -no-undefined + CC = @CC@ CFILES = $(wildcard *.c) @@ -11,7 +14,7 @@ all: $(SOBJS) CFLAGS += -Wall %.so: %.c - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) # if extension needing external libraries are to be # compiled with this make # file, each of them can be added according to the this pattern: @@ -19,14 +22,16 @@ CFLAGS += -Wall # $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< [own compile and link flags] CIE-Lab.so: CIE-Lab.c - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lm + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) -lm lcms.so: lcms.c - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< `pkg-config lcms --cflags --libs` + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags --libs` ############################################################################# -LDFLAGS = -shared -lc +LDFLAGS += -shared + +LDADD = ../babl/.libs/libbabl.a $(win32_libs) $(no-undefined) CFLAGS += -I../babl -- 2.30.2